From bfde0c9ad7281659479641177c5162eea22a325b Mon Sep 17 00:00:00 2001 From: "atse@norwich.uk.xensource.com" Date: Sat, 23 Sep 2006 13:39:32 +0100 Subject: [PATCH] [XM] Fix argument parsing for dump-core subcommand Signed-off-by: Masaki Kanno Signed-off-by: Alastair Tse --- tools/python/xen/xm/main.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index 24e165ac66..3e1235091a 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -701,22 +701,21 @@ def xm_unpause(args): server.xend.domain.unpause(dom) def xm_dump_core(args): - arg_check(args, "dump-core",1,3) live = False crash = False - import getopt - (options, params) = getopt.gnu_getopt(args, 'LC', ['live','crash']) - - for (k, v) in options: - if k in ['-L', '--live']: - live = True - if k in ['-C', '--crash']: - crash = True - - if len(params) == 0 or len(params) > 2: - err("invalid number of parameters") - usage("dump-core") - + try: + (options, params) = getopt.gnu_getopt(args, 'LC', ['live','crash']) + for (k, v) in options: + if k in ('-L', '--live'): + live = True + if k in ('-C', '--crash'): + crash = True + + if len(params) not in (1, 2): + raise OptionError("Expects 1 or 2 argument(s)") + except getopt.GetoptError, e: + raise OptionError(str(e)) + dom = params[0] if len(params) == 2: filename = os.path.abspath(params[1]) @@ -727,14 +726,14 @@ def xm_dump_core(args): server.xend.domain.pause(dom) try: - print "dumping core of domain:%s ..." % str(dom) + print "Dumping core of domain: %s ..." % str(dom) server.xend.domain.dump(dom, filename, live, crash) finally: if not live: server.xend.domain.unpause(dom) if crash: - print "destroying domain:%s ..." % str(dom) + print "Destroying domain: %s ..." % str(dom) server.xend.domain.destroy(dom) def xm_rename(args): -- 2.30.2